Revision: bazaar--devo--1.1--patch-109
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Tue Jan 11 08:53:23 GMT 2005
Standard-date: 2005-01-11 08:53:23 GMT
Modified-files: commands/diff.c libarch/merge.c
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.1--patch-68
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-69
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-70
    thelove@canonical.com/bazaar--devo--1.1--patch-109
Summary: tweak the diff dot-progress code, the carriage return was emitted before the callback-calling function was called.
Keywords: 

Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-68
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-69
   tweak the diff dot-progress code, the carriage return was emitted before the callback-calling function was called.

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-70
   change optimal to best in merge progress and warnings, closes: #5259

